From 0091eb7f40b2b0a6567263d1cc097c2529084045 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Mon, 7 Dec 2015 13:09:08 +0000 Subject: [PATCH] tools/libxc: Identify problematic file in error messages Error messages along the lines of: xc: error: panic: xc_dom_core.c:207: failed to open file: No such file or directory: Internal error are of very little use. Include the filename in the error messages, so the user does not have to resort to debug level logging to identify the problem. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 841e7dc355..2061ba6921 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -203,16 +203,16 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, fd = open(filename, O_RDONLY); if ( fd == -1 ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to open file: %s", - strerror(errno)); + "failed to open file '%s': %s", + filename, strerror(errno)); goto err; } if ( (lseek(fd, 0, SEEK_SET) == -1) || ((offset = lseek(fd, 0, SEEK_END)) == -1) ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to seek on file: %s", - strerror(errno)); + "failed to seek on file '%s': %s", + filename, strerror(errno)); goto err; } @@ -239,8 +239,8 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, MAP_SHARED, fd, 0); if ( block->ptr == MAP_FAILED ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to mmap file: %s", - strerror(errno)); + "failed to mmap file '%s': %s", + filename, strerror(errno)); goto err; } -- 2.30.2